auto upstream
authorJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 12:51:05 +0000 (13:51 +0100)
committerJoakim Verona <joakim@verona.se>
Sun, 23 Dec 2012 12:51:05 +0000 (13:51 +0100)

Trivial merge